projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f4b3779) | patch
(smerge-resolve): New arg `safe'.
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 16 Aug 2007 20:04:36 +0000 (20:04 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 16 Aug 2007 20:04:36 +0000 (20:04 +0000)
commitbe51e9f2a52f4e88b524d0101a9bbd4fadeb0cc5
tree963e1e0c699d2580b32cb36ef910deae27448c51tree | snapshot
parentf4b3779ee3b20f544382c2a9db5c1c958dff93b1commit | diff
(smerge-resolve): New arg `safe'.
(smerge-resolve-all, smerge-batch-resolve): New function.
(smerge-refine): Make sure `diff' returns the expected result.
(smerge-parsep-re): New const.
(smerge-mode): Use it to adjust paragraph-separate.
lisp/ChangeLog diff | blob | history
lisp/smerge-mode.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.